From 20433efbfaf462ac155b90a64a5e83c9a3b3f2e1 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Mon, 30 May 2011 19:29:22 +0200 Subject: [PATCH] gtkcssprovider: Free shorthand border GValues in the right place The call to gtk_border_free() within unpack_border() felt completely in the wrong place, as the border actually pertains to the GValue being unpacked. Plus, the GValue itself was also being leaked. --- gtk/gtkcssprovider.c | 1 + gtk/gtkstyleproperty.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index e1b9b33bcd..2893521939 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -1092,6 +1092,7 @@ gtk_css_ruleset_add (GtkCssRuleset *ruleset, gtk_css_ruleset_add (ruleset, child, value); } g_free (parameters); + property_value_free (value); return; } diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c index 65cd58b6ae..b2fa41fffb 100644 --- a/gtk/gtkstyleproperty.c +++ b/gtk/gtkstyleproperty.c @@ -1187,8 +1187,6 @@ unpack_border (const GValue *value, g_value_init (¶meter[3].value, G_TYPE_INT); g_value_set_int (¶meter[3].value, border->right); - gtk_border_free (border); - *n_params = 4; return parameter; } -- 2.30.2